From af28c031fc15826053960c1b46d3df1837feb09a Mon Sep 17 00:00:00 2001 From: Daniel Boles Date: Fri, 6 Oct 2017 20:24:01 +0100 Subject: [PATCH] =?utf8?q?TreeViewCol:=20Don=E2=80=99t=20try=20to=20discon?= =?utf8?q?nect=20null=20treeview?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit https://bugzilla.gnome.org/show_bug.cgi?id=788614 --- gtk/gtktreeviewcolumn.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 7076153f5b..9dd368ab8e 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -1331,10 +1331,11 @@ _gtk_tree_view_column_unset_tree_view (GtkTreeViewColumn *column) { GtkTreeViewColumnPrivate *priv = column->priv; - if (priv->tree_view) - { - gtk_container_remove (GTK_CONTAINER (priv->tree_view), priv->button); - } + if (priv->tree_view == NULL) + return; + + gtk_container_remove (GTK_CONTAINER (priv->tree_view), priv->button); + if (priv->property_changed_signal) { g_signal_handler_disconnect (priv->tree_view, priv->property_changed_signal); @@ -1344,7 +1345,7 @@ _gtk_tree_view_column_unset_tree_view (GtkTreeViewColumn *column) if (priv->sort_column_changed_signal) { g_signal_handler_disconnect (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree_view)), - priv->sort_column_changed_signal); + priv->sort_column_changed_signal); priv->sort_column_changed_signal = 0; } -- 2.30.2